Remove various E4X junk remove4x can't handle

diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index 6998dd2e05c7cf343e1ed5bf78e91b0179cfbf66..0782bf026504aa5cf06830a1cf24e8bc949a3c8e 100644 (file)
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -20,7 +20,7 @@ const ObjectManagerIface = <interface name="org.freedesktop.DBus.ObjectManager">
     <arg name="objectPath" type="o"/>
     <arg name="interfaces" type="as" />
   </signal>
-</interface>
+</interface>;
 
 const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);
 

diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
index 8204e72e3436191b4e2a7c33b004f8686f71efa5..ac710ff1f08bd64acb15b20cd684df48a2b81ac2 100644 (file)
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@@ -4,14 +4,12 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Main = imports.ui.main;
 
-const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
 const MAG_SERVICE_PATH = '/org/gnome/Magnifier';
-const ZOOM_SERVICE_NAME = 'org.gnome.Magnifier.ZoomRegion';
 const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
 
 // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
-const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
+const MagnifierIface = <interface name="org.gnome.Magnifier">
 <method name="setActive">
     <arg type="b" direction="in" />
 </method>
@@ -66,7 +64,7 @@ const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
 
 // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
-const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
+const ZoomRegionIface = <interface name="org.gnome.Magnifier.ZoomRegion">
 <method name="setMagFactor">
     <arg type="d" direction="in" />
     <arg type="d" direction="in" />

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 9ac635f0224e5d5e3b2a817de4063ab85fb9dc0e..5e93a8cf56d59ccc67a7c0d100dd1704d69ac76b 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -41,8 +41,7 @@ const MAX_INPUT_SOURCE_ACTIVATION_TIME = 4000; // ms
 const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard';
 
-const KeyboardManagerInterface =
-<interface name="org.gnome.SettingsDaemon.Keyboard">
+const KeyboardManagerInterface = <interface name="org.gnome.SettingsDaemon.Keyboard">
 <method name="SetInputSource">
     <arg type="u" direction="in" />
 </method>